Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 15 Apr 2013 13:44:14 +0000 (16:44 +0300)
committerEli Zaretskii <eliz@gnu.org>
Mon, 15 Apr 2013 13:44:14 +0000 (16:44 +0300)
commitaa58700731c11907ea3d38d81f120db5f574ddc7
treecd8c9342274504c289ee7913713515c80781ef27
parent038f8d2e30bb324ce2c91b3796d188440d6eaa53
parenta196d66d444544171b2a261dc81715ca1c72503a
Merge from trunk.